Kill stray conflict line.
authorRobert Brady <rbrady@src.gnome.org>
Thu, 16 Nov 2000 00:47:38 +0000 (00:47 +0000)
committerRobert Brady <rbrady@src.gnome.org>
Thu, 16 Nov 2000 00:47:38 +0000 (00:47 +0000)
commitc087b64c77b7fc2ac7aadf78c6f47eb2ba99c7a1
treec75ac157cc750c8e46007f379efc167cc5830030
parentfe682268d12e866768a3826a906f353507df6002
Kill stray conflict line.
ChangeLog
ChangeLog.pre-2-0
ChangeLog.pre-2-10
ChangeLog.pre-2-2
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8